Updated Gemfile to point to tumblr/tumblr_client@0c59b0

Dustin Miller vor 8 Jahren
Ursprung
Commit
2b9f7b7169
2 geänderte Dateien mit 147 neuen Zeilen und 122 gelöschten Zeilen
  1. 2 2
      Gemfile
  2. 145 120
      Gemfile.lock

+ 2 - 2
Gemfile

@@ -29,7 +29,7 @@ gem 'twitter-stream', github: 'cantino/twitter-stream', branch: 'huginn'
29 29
 gem 'omniauth-twitter'
30 30
 
31 31
 # Tumblr Agents
32
-gem 'tumblr_client'
32
+gem 'tumblr_client', github: 'tumblr/tumblr_client', ref: '0c59b'
33 33
 gem 'omniauth-tumblr'
34 34
 
35 35
 # Dropbox Agents
@@ -67,7 +67,7 @@ gem 'devise', '~> 3.4.0'
67 67
 gem 'dotenv-rails', '~> 2.0.1'
68 68
 gem 'em-http-request', '~> 1.1.2'
69 69
 gem 'faraday', '~> 0.9.0'
70
-gem 'faraday_middleware'
70
+gem 'faraday_middleware', '>= 0.10.0'
71 71
 gem 'feed-normalizer'
72 72
 gem 'font-awesome-sass', '~> 4.3.2'
73 73
 gem 'foreman', '~> 0.63.0'

+ 145 - 120
Gemfile.lock

@@ -20,6 +20,19 @@ GIT
20 20
       rest-client (~> 1.8)
21 21
 
22 22
 GIT
23
+  remote: git://github.com/tumblr/tumblr_client.git
24
+  revision: 0c59b04e49f2a8c89860613b18cf4e8f978d8dc7
25
+  ref: 0c59b
26
+  specs:
27
+    tumblr_client (0.8.5)
28
+      faraday (~> 0.9.0)
29
+      faraday_middleware (~> 0.9)
30
+      json
31
+      mime-types
32
+      oauth
33
+      simple_oauth
34
+
35
+GIT
23 36
   remote: git://github.com/wunderlist/omniauth-wunderlist.git
24 37
   revision: d0910d0396107b9302aa1bc50e74bb140990ccb8
25 38
   ref: d0910d0396107b9302aa1bc50e74bb140990ccb8
@@ -100,28 +113,26 @@ GEM
100 113
     capistrano-bundler (1.1.4)
101 114
       capistrano (~> 3.1)
102 115
       sshkit (~> 1.2)
103
-    capistrano-rails (1.1.3)
116
+    capistrano-rails (1.1.5)
104 117
       capistrano (~> 3.1)
105 118
       capistrano-bundler (~> 1.1)
106
-    celluloid (0.16.0)
107
-      timers (~> 4.0.0)
108 119
     chronic (0.10.2)
109 120
     coderay (1.1.0)
110 121
     coffee-rails (4.1.0)
111 122
       coffee-script (>= 2.2.0)
112 123
       railties (>= 4.0.0, < 5.0)
113
-    coffee-script (2.3.0)
124
+    coffee-script (2.4.1)
114 125
       coffee-script-source
115 126
       execjs
116
-    coffee-script-source (1.9.1)
127
+    coffee-script-source (1.9.1.1)
117 128
     colorize (0.7.7)
118 129
     cookiejar (0.3.2)
119
-    coveralls (0.7.1)
120
-      multi_json (~> 1.3)
121
-      rest-client
122
-      simplecov (>= 0.7)
123
-      term-ansicolor
124
-      thor
130
+    coveralls (0.8.3)
131
+      json (~> 1.8)
132
+      rest-client (>= 1.6.8, < 2)
133
+      simplecov (~> 0.10.0)
134
+      term-ansicolor (~> 1.3)
135
+      thor (~> 0.19.1)
125 136
     crack (0.4.2)
126 137
       safe_yaml (~> 1.0.0)
127 138
     daemons (1.1.9)
@@ -139,11 +150,12 @@ GEM
139 150
       warden (~> 1.2.3)
140 151
     diff-lcs (1.2.5)
141 152
     docile (1.1.5)
142
-    domain_name (0.5.24)
153
+    domain_name (0.5.25)
143 154
       unf (>= 0.0.5, < 1.0.0)
144
-    dotenv (2.0.1)
145
-    dotenv-rails (2.0.1)
146
-      dotenv (= 2.0.1)
155
+    dotenv (2.0.2)
156
+    dotenv-rails (2.0.2)
157
+      dotenv (= 2.0.2)
158
+      railties (~> 4.0)
147 159
     dropbox-api (0.4.2)
148 160
       hashie
149 161
       multi_json
@@ -154,7 +166,7 @@ GEM
154 166
       em-socksify (>= 0.3)
155 167
       eventmachine (>= 1.0.3)
156 168
       http_parser.rb (>= 0.6.0)
157
-    em-socksify (0.3.0)
169
+    em-socksify (0.3.1)
158 170
       eventmachine (>= 1.0.0.beta.4)
159 171
     em-websocket (0.5.1)
160 172
       eventmachine (>= 0.12.9)
@@ -163,23 +175,23 @@ GEM
163 175
     erector (0.10.0)
164 176
       treetop (>= 1.2.3)
165 177
     erubis (2.7.0)
166
-    ethon (0.7.1)
178
+    ethon (0.8.0)
167 179
       ffi (>= 1.3.0)
168
-    eventmachine (1.0.7)
180
+    eventmachine (1.0.8)
169 181
     evernote-thrift (1.25.1)
170 182
     evernote_oauth (0.2.3)
171 183
       evernote-thrift
172 184
       oauth (>= 0.4.1)
173
-    execjs (2.3.0)
185
+    execjs (2.6.0)
174 186
     extlib (0.9.16)
175
-    faraday (0.9.1)
187
+    faraday (0.9.2)
176 188
       multipart-post (>= 1.2, < 3)
177 189
     faraday_middleware (0.10.0)
178 190
       faraday (>= 0.7.4, < 0.10)
179 191
     feed-normalizer (1.5.2)
180 192
       hpricot (>= 0.6)
181 193
       simple-rss (>= 1.1)
182
-    ffi (1.9.5)
194
+    ffi (1.9.10)
183 195
     font-awesome-sass (4.3.2.1)
184 196
       sass (~> 3.2)
185 197
     forecast_io (2.0.0)
@@ -197,35 +209,47 @@ GEM
197 209
       rails (>= 3.0)
198 210
     globalid (0.3.6)
199 211
       activesupport (>= 4.1.0)
200
-    google-api-client (0.7.1)
201
-      addressable (>= 2.3.2)
202
-      autoparse (>= 0.3.3)
203
-      extlib (>= 0.9.15)
204
-      faraday (>= 0.9.0)
205
-      jwt (>= 0.1.5)
206
-      launchy (>= 2.1.1)
207
-      multi_json (>= 1.0.0)
208
-      retriable (>= 1.4)
209
-      signet (>= 0.5.0)
210
-      uuidtools (>= 2.1.0)
211
-    guard (2.6.1)
212
+    google-api-client (0.8.6)
213
+      activesupport (>= 3.2)
214
+      addressable (~> 2.3)
215
+      autoparse (~> 0.3)
216
+      extlib (~> 0.9)
217
+      faraday (~> 0.9)
218
+      googleauth (~> 0.3)
219
+      launchy (~> 2.4)
220
+      multi_json (~> 1.10)
221
+      retriable (~> 1.4)
222
+      signet (~> 0.6)
223
+    googleauth (0.4.2)
224
+      faraday (~> 0.9)
225
+      jwt (~> 1.4)
226
+      logging (~> 2.0)
227
+      memoist (~> 0.12)
228
+      multi_json (~> 1.11)
229
+      signet (~> 0.6)
230
+    guard (2.13.0)
212 231
       formatador (>= 0.2.4)
213
-      listen (~> 2.7)
232
+      listen (>= 2.7, <= 4.0)
214 233
       lumberjack (~> 1.0)
234
+      nenv (~> 0.1)
235
+      notiffany (~> 0.0)
215 236
       pry (>= 0.9.12)
237
+      shellany (~> 0.0)
216 238
       thor (>= 0.18.1)
217
-    guard-livereload (2.2.0)
239
+    guard-compat (1.2.1)
240
+    guard-livereload (2.5.0)
218 241
       em-websocket (~> 0.5)
219
-      guard (~> 2.0)
242
+      guard (~> 2.8)
243
+      guard-compat (~> 1.0)
220 244
       multi_json (~> 1.8)
221
-    guard-rspec (4.3.1)
245
+    guard-rspec (4.6.4)
222 246
       guard (~> 2.1)
223
-      rspec (>= 2.14, < 4.0)
247
+      guard-compat (~> 1.1)
248
+      rspec (>= 2.99.0, < 4.0)
224 249
     hashie (2.0.5)
225 250
     haversine (0.3.0)
226 251
     hipchat (1.2.0)
227 252
       httparty
228
-    hitimes (1.2.2)
229 253
     hpricot (0.8.6)
230 254
     httmultiparty (0.3.10)
231 255
       httparty (>= 0.7.3)
@@ -238,22 +262,23 @@ GEM
238 262
     httparty (0.13.1)
239 263
       json (~> 1.8)
240 264
       multi_xml (>= 0.5.2)
241
-    hypdf (1.0.7)
265
+    hypdf (1.0.8)
242 266
       httmultiparty (= 0.3.10)
267
+      httparty (= 0.13.1)
243 268
     i18n (0.7.0)
244
-    jquery-rails (3.1.3)
269
+    jquery-rails (3.1.4)
245 270
       railties (>= 3.0, < 5.0)
246 271
       thor (>= 0.14, < 2.0)
247 272
     json (1.8.3)
248 273
     jsonpath (0.5.7)
249 274
       multi_json
250
-    jwt (1.4.1)
251
-    kaminari (0.16.1)
275
+    jwt (1.5.1)
276
+    kaminari (0.16.3)
252 277
       actionpack (>= 3.0.0)
253 278
       activesupport (>= 3.0.0)
254
-    kgio (2.9.3)
279
+    kgio (2.10.0)
255 280
     kramdown (1.3.3)
256
-    launchy (2.4.2)
281
+    launchy (2.4.3)
257 282
       addressable (~> 2.3)
258 283
     letter_opener (1.4.1)
259 284
       launchy (~> 2.2)
@@ -261,12 +286,15 @@ GEM
261 286
       actionmailer (>= 3.2)
262 287
       letter_opener (~> 1.0)
263 288
       railties (>= 3.2)
264
-    libv8 (3.16.14.7)
289
+    libv8 (3.16.14.13)
265 290
     liquid (3.0.6)
266
-    listen (2.7.9)
267
-      celluloid (>= 0.15.2)
291
+    listen (3.0.3)
268 292
       rb-fsevent (>= 0.9.3)
269 293
       rb-inotify (>= 0.9)
294
+    little-plugger (1.1.4)
295
+    logging (2.0.0)
296
+      little-plugger (~> 1.1)
297
+      multi_json (~> 1.10)
270 298
     loofah (2.0.3)
271 299
       nokogiri (>= 1.5.9)
272 300
     lumberjack (1.0.9)
@@ -274,26 +302,31 @@ GEM
274 302
       systemu (~> 2.6.2)
275 303
     mail (2.6.3)
276 304
       mime-types (>= 1.16, < 3)
305
+    memoist (0.12.0)
277 306
     memoizable (0.4.2)
278 307
       thread_safe (~> 0.3, >= 0.3.1)
279 308
     method_source (0.8.2)
280
-    mime-types (2.6.1)
281
-    mini_magick (4.2.3)
309
+    mime-types (2.6.2)
310
+    mini_magick (4.3.6)
282 311
     mini_portile (0.6.2)
283
-    minitest (5.8.0)
312
+    minitest (5.8.1)
284 313
     mqtt (0.3.1)
285 314
     multi_json (1.11.2)
286 315
     multi_xml (0.5.5)
287 316
     multipart-post (2.0.0)
288
-    mysql2 (0.3.16)
289
-    naught (1.0.0)
317
+    mysql2 (0.3.20)
318
+    naught (1.1.0)
319
+    nenv (0.2.0)
290 320
     net-ftp-list (3.2.8)
291 321
     net-scp (1.2.1)
292 322
       net-ssh (>= 2.6.5)
293
-    net-ssh (2.9.2)
323
+    net-ssh (3.0.1)
294 324
     netrc (0.10.3)
295 325
     nokogiri (1.6.6.2)
296 326
       mini_portile (~> 0.6.0)
327
+    notiffany (0.0.8)
328
+      nenv (~> 0.1)
329
+      shellany (~> 0.0)
297 330
     oauth (0.4.7)
298 331
     oauth2 (0.9.4)
299 332
       faraday (>= 0.8, < 0.10)
@@ -313,7 +346,7 @@ GEM
313 346
       evernote-thrift
314 347
       multi_json (~> 1.0)
315 348
       omniauth-oauth (~> 1.0)
316
-    omniauth-oauth (1.0.1)
349
+    omniauth-oauth (1.1.0)
317 350
       oauth
318 351
       omniauth (~> 1.0)
319 352
     omniauth-oauth2 (1.1.2)
@@ -323,15 +356,15 @@ GEM
323 356
       omniauth (~> 1.2)
324 357
     omniauth-tumblr (1.1)
325 358
       omniauth-oauth (~> 1.0)
326
-    omniauth-twitter (1.0.1)
327
-      multi_json (~> 1.3)
328
-      omniauth-oauth (~> 1.0)
359
+    omniauth-twitter (1.2.1)
360
+      json (~> 1.3)
361
+      omniauth-oauth (~> 1.1)
329 362
     orm_adapter (0.5.0)
330
-    pg (0.17.1)
363
+    pg (0.18.3)
331 364
     polyglot (0.3.5)
332
-    protected_attributes (1.0.8)
365
+    protected_attributes (1.0.9)
333 366
       activemodel (>= 4.0.1, < 5.0)
334
-    pry (0.10.1)
367
+    pry (0.10.3)
335 368
       coderay (~> 1.1.0)
336 369
       method_source (~> 0.8.1)
337 370
       slop (~> 3.4)
@@ -365,52 +398,52 @@ GEM
365 398
       rails_serve_static_assets
366 399
       rails_stdout_logging
367 400
     rails_serve_static_assets (0.0.4)
368
-    rails_stdout_logging (0.0.3)
401
+    rails_stdout_logging (0.0.4)
369 402
     railties (4.2.4)
370 403
       actionpack (= 4.2.4)
371 404
       activesupport (= 4.2.4)
372 405
       rake (>= 0.8.7)
373 406
       thor (>= 0.18.1, < 2.0)
374
-    raindrops (0.13.0)
407
+    raindrops (0.15.0)
375 408
     rake (10.4.2)
376
-    rb-fsevent (0.9.4)
409
+    rb-fsevent (0.9.6)
377 410
     rb-inotify (0.9.5)
378 411
       ffi (>= 0.5.0)
379
-    ref (1.0.5)
412
+    ref (2.0.0)
380 413
     responders (2.1.0)
381 414
       railties (>= 4.2.0, < 5)
382 415
     rest-client (1.8.0)
383 416
       http-cookie (>= 1.0.2, < 2.0)
384 417
       mime-types (>= 1.16, < 3.0)
385 418
       netrc (~> 0.7)
386
-    retriable (2.0.2)
419
+    retriable (1.4.1)
387 420
     rr (1.1.2)
388
-    rspec (3.2.0)
389
-      rspec-core (~> 3.2.0)
390
-      rspec-expectations (~> 3.2.0)
391
-      rspec-mocks (~> 3.2.0)
421
+    rspec (3.3.0)
422
+      rspec-core (~> 3.3.0)
423
+      rspec-expectations (~> 3.3.0)
424
+      rspec-mocks (~> 3.3.0)
392 425
     rspec-collection_matchers (1.1.2)
393 426
       rspec-expectations (>= 2.99.0.beta1)
394
-    rspec-core (3.2.1)
395
-      rspec-support (~> 3.2.0)
396
-    rspec-expectations (3.2.0)
427
+    rspec-core (3.3.2)
428
+      rspec-support (~> 3.3.0)
429
+    rspec-expectations (3.3.1)
397 430
       diff-lcs (>= 1.2.0, < 2.0)
398
-      rspec-support (~> 3.2.0)
431
+      rspec-support (~> 3.3.0)
399 432
     rspec-html-matchers (0.7.0)
400 433
       nokogiri (~> 1)
401 434
       rspec (~> 3)
402
-    rspec-mocks (3.2.1)
435
+    rspec-mocks (3.3.2)
403 436
       diff-lcs (>= 1.2.0, < 2.0)
404
-      rspec-support (~> 3.2.0)
405
-    rspec-rails (3.2.1)
437
+      rspec-support (~> 3.3.0)
438
+    rspec-rails (3.3.3)
406 439
       actionpack (>= 3.0, < 4.3)
407 440
       activesupport (>= 3.0, < 4.3)
408 441
       railties (>= 3.0, < 4.3)
409
-      rspec-core (~> 3.2.0)
410
-      rspec-expectations (~> 3.2.0)
411
-      rspec-mocks (~> 3.2.0)
412
-      rspec-support (~> 3.2.0)
413
-    rspec-support (3.2.2)
442
+      rspec-core (~> 3.3.0)
443
+      rspec-expectations (~> 3.3.0)
444
+      rspec-mocks (~> 3.3.0)
445
+      rspec-support (~> 3.3.0)
446
+    rspec-support (3.3.0)
414 447
     rturk (2.12.1)
415 448
       erector
416 449
       nokogiri
@@ -420,36 +453,38 @@ GEM
420 453
     rufus-scheduler (3.0.9)
421 454
       tzinfo
422 455
     safe_yaml (1.0.4)
423
-    sass (3.4.14)
424
-    sass-rails (5.0.3)
456
+    sass (3.4.19)
457
+    sass-rails (5.0.4)
425 458
       railties (>= 4.0.0, < 5.0)
426 459
       sass (~> 3.1)
427 460
       sprockets (>= 2.8, < 4.0)
428 461
       sprockets-rails (>= 2.0, < 4.0)
429
-      tilt (~> 1.1)
462
+      tilt (>= 1.1, < 3)
430 463
     select2-rails (3.5.9.3)
431 464
       thor (~> 0.14)
432
-    shoulda-matchers (2.8.0)
433
-      activesupport (>= 3.0.0)
434
-    signet (0.5.1)
435
-      addressable (>= 2.2.3)
436
-      faraday (>= 0.9.0.rc5)
437
-      jwt (>= 0.1.5)
438
-      multi_json (>= 1.0.0)
465
+    shellany (0.0.1)
466
+    shoulda-matchers (3.0.0)
467
+      activesupport (>= 4.0.0)
468
+    signet (0.6.1)
469
+      addressable (~> 2.3)
470
+      extlib (~> 0.9)
471
+      faraday (~> 0.9)
472
+      jwt (~> 1.5)
473
+      multi_json (~> 1.10)
439 474
     simple-rss (1.3.1)
440 475
     simple_oauth (0.3.1)
441
-    simplecov (0.9.2)
476
+    simplecov (0.10.0)
442 477
       docile (~> 1.1.0)
443
-      multi_json (~> 1.0)
444
-      simplecov-html (~> 0.9.0)
445
-    simplecov-html (0.9.0)
478
+      json (~> 1.8)
479
+      simplecov-html (~> 0.10.0)
480
+    simplecov-html (0.10.0)
446 481
     slack-notifier (1.0.0)
447 482
     slop (3.6.0)
448
-    spectrum-rails (1.3.4)
483
+    spectrum-rails (1.6.2)
449 484
       railties (>= 3.1)
450
-    sprockets (3.3.4)
451
-      rack (~> 1.0)
452
-    sprockets-rails (2.3.2)
485
+    sprockets (3.4.0)
486
+      rack (> 1, < 3)
487
+    sprockets-rails (2.3.3)
453 488
       actionpack (>= 3.0)
454 489
       activesupport (>= 3.0)
455 490
       sprockets (>= 2.8, < 4.0)
@@ -458,27 +493,18 @@ GEM
458 493
       net-scp (>= 1.1.2)
459 494
       net-ssh (>= 2.8.0)
460 495
     string-scrub (0.0.5)
461
-    systemu (2.6.4)
462
-    term-ansicolor (1.3.0)
496
+    systemu (2.6.5)
497
+    term-ansicolor (1.3.2)
463 498
       tins (~> 1.0)
464 499
     therubyracer (0.12.2)
465 500
       libv8 (~> 3.16.14.0)
466 501
       ref
467 502
     thor (0.19.1)
468 503
     thread_safe (0.3.5)
469
-    tilt (1.4.1)
470
-    timers (4.0.1)
471
-      hitimes
472
-    tins (1.3.2)
473
-    treetop (1.5.3)
504
+    tilt (2.0.1)
505
+    tins (1.6.0)
506
+    treetop (1.6.3)
474 507
       polyglot (~> 0.3)
475
-    tumblr_client (0.8.2)
476
-      faraday (>= 0.8)
477
-      faraday_middleware (>= 0.8)
478
-      json
479
-      mime-types
480
-      oauth
481
-      simple_oauth
482 508
     twilio-ruby (3.11.6)
483 509
       builder (>= 2.1.2)
484 510
       jwt (>= 0.1.2)
@@ -498,7 +524,7 @@ GEM
498 524
       ethon (>= 0.7.1)
499 525
     tzinfo (1.2.2)
500 526
       thread_safe (~> 0.1)
501
-    uglifier (2.7.0)
527
+    uglifier (2.7.2)
502 528
       execjs (>= 0.3.0)
503 529
       json (>= 1.8.0)
504 530
     unf (0.1.4)
@@ -508,10 +534,9 @@ GEM
508 534
       kgio (~> 2.6)
509 535
       rack
510 536
       raindrops (~> 0.7)
511
-    uuid (2.3.7)
537
+    uuid (2.3.8)
512 538
       macaddr (~> 1.0)
513
-    uuidtools (2.1.5)
514
-    vcr (2.9.2)
539
+    vcr (2.9.3)
515 540
     warden (1.2.3)
516 541
       rack (>= 1.0)
517 542
     webmock (1.17.4)
@@ -547,7 +572,7 @@ DEPENDENCIES
547 572
   em-http-request (~> 1.1.2)
548 573
   evernote_oauth
549 574
   faraday (~> 0.9.0)
550
-  faraday_middleware
575
+  faraday_middleware (>= 0.10.0)
551 576
   feed-normalizer
552 577
   ffi (>= 1.9.4)
553 578
   font-awesome-sass (~> 4.3.2)
@@ -605,7 +630,7 @@ DEPENDENCIES
605 630
   spectrum-rails
606 631
   string-scrub
607 632
   therubyracer (~> 0.12.2)
608
-  tumblr_client
633
+  tumblr_client!
609 634
   twilio-ruby (~> 3.11.5)
610 635
   twitter (~> 5.14.0)
611 636
   twitter-stream!